Skip to content

Migrate random to pyproject.toml from setup.py #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Migrate random to pyproject.toml from setup.py #62

wants to merge 28 commits into from

Conversation

ndgrigorian
Copy link
Collaborator

@ndgrigorian ndgrigorian commented Apr 13, 2025 •
edited
Loading

This PR migrates mkl_random to pyproject.toml from setup.py

Also adjusts build system, removing mkl-service as a test requirement (it was previously added as part of a work-around, which was removed) and moves to use python -m pip install in build scripts instead of calling setup.py and updates min NumPy version

@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch 2 times, most recently from 057f53c to 091f047 Compare April 13, 2025 18:24
@ndgrigorian ndgrigorian mentioned this pull request Apr 13, 2025
Closed
@ndgrigorian
Copy link
Collaborator Author

ndgrigorian commented Apr 13, 2025 •
edited
Loading

@vtavana
For some reason, including the project.license field in pyproject.toml causes builds to fail citing [REDACTED: solved the problem, setuptools needed to be pinned in the CI, oops!]

configuration error: `project.license` must be valid exactly by one definition (2 matches found):

    - keys:
        'file': {type: string}
      required: ['file']
    - keys:
        'text': {type: string}
      required: ['text']

did you see this at all with mkl_fft? Only happens in CI as well...

@ndgrigorian ndgrigorian requested a review from vtavana April 13, 2025 19:54
@ndgrigorian ndgrigorian changed the title Migrate random to pyproject toml from setup.py Migrate random to pyproject.toml from setup.py Apr 13, 2025
@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch 2 times, most recently from 9abf583 to b9544d8 Compare April 13, 2025 20:28
@ndgrigorian ndgrigorian marked this pull request as ready for review April 13, 2025 20:32
@ndgrigorian
Copy link
Collaborator Author

@ekomarova
I've updated the build scripts here (similar to some previous changes in mkl_fft) to avoid directly calling setup.py since it's been deprecated for years anyway

@ekomarova
Copy link
Collaborator

Thanks, @ndgrigorian! As soon as there is a tag that includes these changes, I can rebuild mkl_random to include this in the internal recipe

vtavana
vtavana reviewed Apr 14, 2025
View reviewed changes
vtavana
vtavana reviewed Apr 14, 2025
View reviewed changes
vtavana
vtavana approved these changes Apr 15, 2025
View reviewed changes
Copy link
Collaborator

@vtavana vtavana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @ndgrigorian!

@vtavana vtavana mentioned this pull request Apr 16, 2025
Merged
@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from bca1fd8 to e7beee2 Compare April 16, 2025 20:26
vtavana
vtavana reviewed Apr 17, 2025
View reviewed changes
@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from 12a73eb to fe5dfe1 Compare April 17, 2025 06:20
ndgrigorian and others added 25 commits April 17, 2025 16:04
@ndgrigorian
Add pyproject.toml and migrate from setup.py
b6a5bb4
@ndgrigorian
Add build instructions to README
40645ad
@ndgrigorian
Clean up pyproject.toml
ff67a36
@ndgrigorian
Pin setuptools to greater than 77
ce8ca25 
Prevents deprecation warning when building
@ndgrigorian
Fix Conda package workflows on PRs
c1832ab
@ndgrigorian
Remove numpy as dependency for tests
6c52bd3 
Already a run dependency
@ndgrigorian
Remove mkl-service as test requirement
b155c87
@ndgrigorian
Change pip to install in build scripts
f3b3d40
@ndgrigorian
Remove license family
5ee291c
@ndgrigorian
Install with pip in clang build
3a59787 
Use no-deps to use oneAPI in environment
@ndgrigorian
Install wheel package in clang builds
1b3437d
@ndgrigorian
Pin setuptools in CI to >=77
0c05403
@ndgrigorian
Adjust pyproject.toml and setup.py license headers
359fe9d 
Also fix formatting in pyproject.toml
@ndgrigorian @vtavana
Update README.md
04e3207 
Co-authored-by: Vahid Tavanashad <[email protected]>
@ndgrigorian
Raise ValueError if MKLROOT variable is not set
f8b2e7c 
avoids call to deprecated `get_info` from numpy.distutils
@ndgrigorian
Remove insertion of setup.py in path
41a07e7
@ndgrigorian
Apply review comments to clang workflow
7b5a63e
@ndgrigorian
remove defaults channel
5aabb91
@ndgrigorian
Add openmp as explicit dependency in test_windows step
59b354d
@ndgrigorian
Run conda-package workflow on 3.11 and 3.12 as well
a4ba7f2
@ndgrigorian
Run all workflows on all supported Python versions
64bdbe5
@ndgrigorian
Run docs workflow on Python 3.12
5e56f05
@ndgrigorian
Make mkl_random dependencies consistent in clang build
2c69830
@ndgrigorian
Update build instructions in docs
1294dc7
@ndgrigorian
Attempt using editable wheel build in docs build
cfb8e0a
@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from fe5dfe1 to af95b70 Compare April 17, 2025 23:06
@ndgrigorian @vtavana
Update Clang worfklow
482aa53 
numpy_build_version->numpy_version

Test with same version of NumPy as build

Co-authored-by: Vahid Tavanashad <[email protected]>
@ndgrigorian ndgrigorian force-pushed the migrate-random-to-pyproject-toml branch from af95b70 to 482aa53 Compare April 17, 2025 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vtavana vtavana vtavana approved these changes

@xaleryb xaleryb Awaiting requested review from xaleryb xaleryb is a code owner

@ekomarova ekomarova Awaiting requested review from ekomarova ekomarova is a code owner

@antonwolfy antonwolfy Awaiting requested review from antonwolfy antonwolfy is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ndgrigorian @ekomarova @antonwolfy @vtavana